From e8b287e5ca548c8ee2911294adc56ba6fb188b59 Mon Sep 17 00:00:00 2001 From: "iap10@labyrinth.cl.cam.ac.uk" Date: Wed, 22 Sep 2004 17:45:38 +0000 Subject: [PATCH] bitkeeper revision 1.1159.81.1 (4151ba42GsBKGsZ8SNv0AImTjMSW7Q) Return ENOSYS for vm86old syscall to prevent XFree86 VESA mode driver crashing. Fix /dev/mem to allocate pagetables from user slab cache. This fixes X for the ATI driver, and probably others. --- linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/entry.S | 2 +- linux-2.6.8.1-xen-sparse/arch/xen/i386/mm/ioremap.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/entry.S b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/entry.S index 4f137e8cea..f1e60cc06c 100644 --- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/entry.S +++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/entry.S @@ -854,7 +854,7 @@ ENTRY(sys_call_table) .long sys_iopl /* 110 */ .long sys_vhangup .long sys_ni_syscall /* old "idle" system call */ - .long sys_vm86old + .long sys_ni_syscall /* disable sys_vm86old */ .long sys_wait4 .long sys_swapoff /* 115 */ .long sys_sysinfo diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/i386/mm/ioremap.c b/linux-2.6.8.1-xen-sparse/arch/xen/i386/mm/ioremap.c index 8a12a5c93c..ddf2ebba8a 100644 --- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/mm/ioremap.c +++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/mm/ioremap.c @@ -381,11 +381,11 @@ static inline int direct_remap_area_pmd(struct mm_struct *mm, if (address >= end) BUG(); do { - pte_t *pte = pte_alloc_kernel(mm, pmd, address); + pte_t *pte = pte_alloc_map(mm, pmd, address); if (!pte) return -ENOMEM; direct_remap_area_pte(pte, address, end - address, v); - + pte_unmap(pte); address = (address + PMD_SIZE) & PMD_MASK; pmd++; } while (address && (address < end)); -- 2.30.2